Drop perf patch, it fails to apply and is hopefully not needed anymore.

diff --git a/debian/changelog b/debian/changelog
index 3558a140bc66c92129d6850708f0e530a569f828..cedd938b3a39d29d4d190c9ecf043e5bfa2f14e1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,6 @@ linux (6.19.6-2+rpi1) forky-staging; urgency=medium
   [changes brought forward from 4.14.13-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 07 Feb 2018 23:32:32 +0000]
   * Disable kernel builds from this package, we build our kernels from other source packages.
 
-  [changes introduced in 5.15.15-2+rpi1 by Peter Michael Green]
-  * Disable libbfd buildid support, it seems to fail to build.
-
   [changed introduced in 6.1.27-1+rpi1 by Peter Michael Green]
   * Disable calls to kernel-wedge, one of them seems to be failing and we
     aren't building kernels from this package anyway.

diff --git a/debian/patches/perf-avoid-binutils-buildid.patch b/debian/patches/perf-avoid-binutils-buildid.patch
deleted file mode 100644 (file)
index 6d1fad1..0000000
--- a/debian/patches/perf-avoid-binutils-buildid.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Disable libbfd buildid support, it seems to fail to build.
-Author: Peter Michael Green <plugwash@raspbian.org>
-
-Index: linux-6.17.13/tools/perf/util/symbol-elf.c
-===================================================================
---- linux-6.17.13.orig/tools/perf/util/symbol-elf.c
-+++ linux-6.17.13/tools/perf/util/symbol-elf.c
-@@ -871,7 +871,8 @@ out:
-       return err;
- }
- 
--#ifdef HAVE_LIBBFD_BUILDID_SUPPORT
-+//*#ifdef HAVE_LIBBFD_BUILDID_SUPPORT
-+#if 0
- 
- static int read_build_id(const char *filename, struct build_id *bid, bool block)
- {

diff --git a/debian/patches/series b/debian/patches/series
index b1b5708e5d68fdd7ad2a60466aa17a66d41d4cd4..7f92536a5376d2ca30436157a9a4863b89af2370 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -123,4 +123,3 @@ bugfix/all/libbpf-use-the-standard-fixdep-build-rule.patch
 bugfix/all/tools-hv-Make-the-sample-hv_get_dhcp_info-script-mor.patch
 
 # ABI maintenance
-perf-avoid-binutils-buildid.patch

diff --git a/debian/patches/series.orig b/debian/patches/series.orig
deleted file mode 100644 (file)
index 7f92536..0000000
--- a/debian/patches/series.orig
+++ /dev/null
@@ -1,125 +0,0 @@
-debian/gitignore.patch
-
-# Disable features broken by exclusion of upstream files
-debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
-debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
-debian/dfsg/video-remove-nvidiafb-and-rivafb.patch
-debian/dfsg/documentation-fix-broken-link-to-cipso-draft.patch
-
-# Changes to support package build system
-debian/version.patch
-debian/uname-version-timestamp.patch
-debian/kernelvariables.patch
-debian/mips-boston-disable-its.patch
-debian/mips-ieee754-relaxed.patch
-debian/mips-enable-r2-to-r6-emu-by-default.patch
-debian/arch-sh4-fix-uimage-build.patch
-debian/tools-perf-perf-read-vdso-in-libexec.patch
-debian/tools-perf-install-python-bindings.patch
-debian/wireless-add-debian-wireless-regdb-certificates.patch
-debian/export-symbols-needed-by-binder.patch
-debian/android-enable-building-binder-as-module.patch
-debian/documentation-drop-sphinx-version-check.patch
-debian/perf-traceevent-support-asciidoctor-for-documentatio.patch
-debian/kbuild-look-for-module.lds-under-arch-directory-too.patch
-debian/kbuild-abort-build-if-subdirs-used.patch
-debian/makefile-make-compiler-version-comparison-optional.patch
-bugfix/all/revert-tools-build-clean-cflags-and-ldflags-for-fixdep.patch
-debian/fixdep-allow-overriding-hostcc-and-hostld.patch
-debian/linux-perf-remove-remaining-source-filenames-from-executable.patch
-
-# Fixes/improvements to firmware loading
-features/all/drivers-media-dvb-usb-af9005-request_firmware.patch
-debian/iwlwifi-do-not-request-unreleased-firmware.patch
-debian/firmware_loader-log-direct-loading-failures-as-info-for-d-i.patch
-bugfix/all/radeon-amdgpu-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
-
-# Change some defaults for security reasons
-debian/af_802154-Disable-auto-loading-as-mitigation-against.patch
-debian/rds-Disable-auto-loading-as-mitigation-against-local.patch
-debian/hamradio-disable-auto-loading-as-mitigation-against-local-exploits.patch
-debian/fs-enable-link-security-restrictions-by-default.patch
-
-# Set various features runtime-disabled by default
-debian/yama-disable-by-default.patch
-debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch
-features/all/security-perf-allow-further-restriction-of-perf_event_open.patch
-features/x86/intel-iommu-add-option-to-exclude-integrated-gpu-only.patch
-features/x86/intel-iommu-add-kconfig-option-to-exclude-igpu-by-default.patch
-
-# Disable autoloading/probing of various drivers by default
-debian/snd-pcsp-disable-autoload.patch
-bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch
-debian/fjes-disable-autoload.patch
-
-# Taint if dangerous features are used
-debian/fanotify-taint-on-use-of-fanotify_access_permissions.patch
-debian/btrfs-warn-about-raid5-6-being-experimental-at-mount.patch
-
-# Arch bug fixes
-bugfix/arm/arm-dts-kirkwood-fix-sata-pinmux-ing-for-ts419.patch
-bugfix/x86/perf-tools-fix-unwind-build-on-i386.patch
-bugfix/arm/arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch
-bugfix/powerpc/powerpc-boot-fix-missing-crc32poly.h-when-building-with-kernel_xz.patch
-bugfix/arm64/arm64-acpi-Add-fixup-for-HPE-m400-quirks.patch
-
-# Arch features
-features/x86/x86-memtest-WARN-if-bad-RAM-found.patch
-features/x86/x86-make-x32-syscall-support-conditional.patch
-features/riscv64/phy-spacemit-Introduce-PCIe-combo-PHY.patch
-features/riscv64/phy-spacemit-support-K1-USB2.0-PHY-controller.patch
-features/riscv64/riscv-dts-spacemit-Add-a-PCIe-regulator.patch
-features/riscv64/riscv-dts-spacemit-PCIe-and-PHY-related-updates.patch
-features/riscv64/riscv-dts-spacemit-Add-USB2-PHY-node-for-K1.patch
-features/riscv64/riscv-dts-spacemit-Add-DWC3-USB-3.0-controller-node-.patch
-features/riscv64/riscv-dts-spacemit-Enable-USB3.0-on-BananaPi-F3.patch
-
-# Miscellaneous bug fixes
-bugfix/all/disable-some-marvell-phys.patch
-bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
-
-# Miscellaneous features
-
-# Lockdown missing pieces
-features/all/lockdown/efi-add-an-efi_secure_boot-flag-to-indicate-secure-b.patch
-features/all/lockdown/efi-lock-down-the-kernel-if-booted-in-secure-boot-mo.patch
-features/all/lockdown/mtd-disable-slram-and-phram-when-locked-down.patch
-features/all/lockdown/arm64-add-kernel-config-option-to-lock-down-when.patch
-
-# Improve integrity platform keyring for kernel modules verification
-features/all/db-mok-keyring/KEYS-Make-use-of-platform-keyring-for-module-signature.patch
-
-# Security fixes
-# QSA-2026: Apparmor
-bugfix/all/qsa-2026-apparmor/0001-apparmor-validate-DFA-start-states-are-in-bounds-in-.patch
-bugfix/all/qsa-2026-apparmor/0002-apparmor-fix-memory-leak-in-verify_header.patch
-bugfix/all/qsa-2026-apparmor/0003-apparmor-replace-recursive-profile-removal-with-iter.patch
-bugfix/all/qsa-2026-apparmor/0004-apparmor-fix-limit-the-number-of-levels-of-policy-na.patch
-bugfix/all/qsa-2026-apparmor/0005-apparmor-fix-side-effect-bug-in-match_char-macro-usa.patch
-bugfix/all/qsa-2026-apparmor/0006-apparmor-fix-missing-bounds-check-on-DEFAULT-table-i.patch
-bugfix/all/qsa-2026-apparmor/0007-apparmor-Fix-double-free-of-ns_name-in-aa_replace_pr.patch
-bugfix/all/qsa-2026-apparmor/0008-apparmor-fix-unprivileged-local-user-can-do-privileg.patch
-bugfix/all/qsa-2026-apparmor/0009-apparmor-fix-differential-encoding-verification.patch
-bugfix/all/qsa-2026-apparmor/0010-apparmor-fix-race-on-rawdata-dereference.patch
-bugfix/all/qsa-2026-apparmor/0011-apparmor-fix-race-between-freeing-data-and-fs-access.patch
-
-# Fix exported symbol versions
-bugfix/all/module-disable-matching-missing-version-crc.patch
-
-# Tools bug fixes
-bugfix/all/usbip-document-tcp-wrappers.patch
-bugfix/all/kbuild-fix-recordmcount-dependency.patch
-bugfix/all/tools-perf-remove-shebangs.patch
-bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch
-bugfix/all/cpupower-fix-checks-for-cpu-existence.patch
-bugfix/all/libapi-define-_fortify_source-as-2-not-empty.patch
-bugfix/all/tools-perf-fix-missing-ldflags-for-some-programs.patch
-bugfix/all/tools_lib_symbol_use_d_fortify_source_2_for_non_debug_builds.patch
-bugfix/all/perf-tools-support-extra-cxxflags.patch
-bugfix/all/perf-tools-pass-extra_cflags-through-to-libbpf-build-again.patch
-bugfix/all/kbuild-bpf-fix-btf-reproducibility.patch
-bugfix/all/perf-docs-Fix-perf-check-manual-page-built-with-asci.patch
-bugfix/all/libbpf-use-the-standard-fixdep-build-rule.patch
-bugfix/all/tools-hv-Make-the-sample-hv_get_dhcp_info-script-mor.patch
-
-# ABI maintenance